merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 13 Jan 2012 04:38:45 +0000 (13:38 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 13 Jan 2012 04:38:45 +0000 (13:38 +0900)

Trivial merge